message-tray: Don't update message count after destruction

When trying to update the message count after a summary icon has
been destroyed, the label to display the count is no longer valid
and trying to set its text results in some Clutter warnings.

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index bd55a3133306a8a82b3f4e59629780bf71be1030..bf72a0f585861afe7bc82ee0c5961462ce4693cb 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -885,6 +885,11 @@ Source.prototype = {
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor.connect('destroy', Lang.bind(this,
+            function() {
+                this._actorDestroyed = true;
+            }));
+        this._actorDestroyed = false;
 
         this._counterLabel = new St.Label();
         this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
@@ -949,6 +954,9 @@ Source.prototype = {
     },
 
     _updateCount: function() {
+        if (this._actorDestroyed)
+            return;
+
         let count = this.notifications.length;
         this._setCount(count, count > 1);
     },